From: awilliam@xenbuild.aw Date: Tue, 12 Sep 2006 17:36:39 +0000 (-0600) Subject: [IA64] machvec cleanups X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15665 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=b80d869bebe13135c14990c67d541ea947c5441d;p=xen.git [IA64] machvec cleanups Move the DIG specific platform_dma_foo defines to where they belong. Signed-off-by: Jes Sorensen --- diff --git a/linux-2.6-xen-sparse/include/asm-ia64/machvec.h b/linux-2.6-xen-sparse/include/asm-ia64/machvec.h index ba0da7b7cf..ca5ea994d6 100644 --- a/linux-2.6-xen-sparse/include/asm-ia64/machvec.h +++ b/linux-2.6-xen-sparse/include/asm-ia64/machvec.h @@ -247,21 +247,6 @@ extern void machvec_init (const char *name); # error Unknown configuration. Update asm-ia64/machvec.h. # endif /* CONFIG_IA64_GENERIC */ -#ifdef CONFIG_XEN -# define platform_dma_map_sg dma_map_sg -# define platform_dma_unmap_sg dma_unmap_sg -# define platform_dma_mapping_error dma_mapping_error -# define platform_dma_supported dma_supported -# define platform_dma_alloc_coherent dma_alloc_coherent -# define platform_dma_free_coherent dma_free_coherent -# define platform_dma_map_single dma_map_single -# define platform_dma_unmap_single dma_unmap_single -# define platform_dma_sync_single_for_cpu \ - dma_sync_single_for_cpu -# define platform_dma_sync_single_for_device \ - dma_sync_single_for_device -#endif - /* * Declare default routines which aren't declared anywhere else: */ diff --git a/linux-2.6-xen-sparse/include/asm-ia64/machvec_dig.h b/linux-2.6-xen-sparse/include/asm-ia64/machvec_dig.h new file mode 100644 index 0000000000..40ae167ed4 --- /dev/null +++ b/linux-2.6-xen-sparse/include/asm-ia64/machvec_dig.h @@ -0,0 +1,33 @@ +#ifndef _ASM_IA64_MACHVEC_DIG_h +#define _ASM_IA64_MACHVEC_DIG_h + +extern ia64_mv_setup_t dig_setup; +extern ia64_mv_irq_init_t dig_irq_init; + +/* + * This stuff has dual use! + * + * For a generic kernel, the macros are used to initialize the + * platform's machvec structure. When compiling a non-generic kernel, + * the macros are used directly. + */ +#define platform_name "dig" +#define platform_setup dig_setup +#define platform_irq_init dig_irq_init + +#ifdef CONFIG_XEN +# define platform_dma_map_sg dma_map_sg +# define platform_dma_unmap_sg dma_unmap_sg +# define platform_dma_mapping_error dma_mapping_error +# define platform_dma_supported dma_supported +# define platform_dma_alloc_coherent dma_alloc_coherent +# define platform_dma_free_coherent dma_free_coherent +# define platform_dma_map_single dma_map_single +# define platform_dma_unmap_single dma_unmap_single +# define platform_dma_sync_single_for_cpu \ + dma_sync_single_for_cpu +# define platform_dma_sync_single_for_device \ + dma_sync_single_for_device +#endif + +#endif /* _ASM_IA64_MACHVEC_DIG_h */